diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 7d5bde5..0b82c2f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -32,6 +32,14 @@
 	  Support USB2/3 functionality in simple SoC integrations with
 	  USB controller based on the DesignWare USB3 IP Core.
 
+config USB_XHCI_EXYNOS
+	bool "Support for Samsung Exynos5 family on-chip xHCI USB controller"
+	depends on ARCH_EXYNOS5
+	default y
+	help
+	  Enables support for he on-chip xHCI controller on Samsung Exynos5
+	  SoCs.
+
 config USB_XHCI_MTK
 	bool "Support for MediaTek on-chip xHCI USB controller"
 	depends on ARCH_MEDIATEK
@@ -157,6 +165,14 @@
 	---help---
 	  Enables support for the on-chip EHCI controller on Atmel chips.
 
+config USB_EHCI_EXYNOS
+	bool "Support for Samsung Exynos EHCI USB controller"
+	depends on ARCH_EXYNOS
+	default y
+	---help---
+	  Enables support for the on-chip EHCI controller on Samsung Exynos
+	  SoCs.
+
 config USB_EHCI_MARVELL
 	bool "Support for Marvell on-chip EHCI USB controller"
 	depends on ARCH_MVEBU || ARCH_KIRKWOOD || ARCH_ORION5X
diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h
index e6f6dbe..8e2f135 100644
--- a/include/configs/exynos5250-common.h
+++ b/include/configs/exynos5250-common.h
@@ -11,11 +11,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE		0x40000000
 
-/* USB */
-#define CONFIG_USB_EHCI_EXYNOS
-
-#define CONFIG_USB_XHCI_EXYNOS
-
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE		(256UL << 20UL)	/* 256 MB */
 
diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h
index cfff8bb..7a9307c 100644
--- a/include/configs/exynos5420-common.h
+++ b/include/configs/exynos5420-common.h
@@ -20,6 +20,4 @@
 #define CONFIG_LOWPOWER_FLAG		0x02020028
 #define CONFIG_LOWPOWER_ADDR		0x0202002C
 
-#define CONFIG_USB_XHCI_EXYNOS
-
 #endif	/* __CONFIG_EXYNOS5420_H */
diff --git a/include/configs/odroid.h b/include/configs/odroid.h
index d4cc882..7448cc9 100644
--- a/include/configs/odroid.h
+++ b/include/configs/odroid.h
@@ -144,11 +144,6 @@
 	"kernel_addr_r=0x41000000\0" \
 	BOOTENV
 
-/* GPT */
-
-/* USB */
-#define CONFIG_USB_EHCI_EXYNOS
-
 /*
  * Supported Odroid boards: X3, U3
  * TODO: Add Odroid X support
diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h
index 35e7d7d..1564629 100644
--- a/include/configs/odroid_xu3.h
+++ b/include/configs/odroid_xu3.h
@@ -16,9 +16,6 @@
 
 #define SDRAM_BANK_SIZE			(256UL << 20UL)	/* 256 MB */
 
-/* USB */
-#define CONFIG_USB_EHCI_EXYNOS
-
 /* DFU */
 #define DFU_DEFAULT_POLL_TIMEOUT	300
 #define DFU_MANIFEST_POLL_TIMEOUT	25000
diff --git a/include/configs/smdk5420.h b/include/configs/smdk5420.h
index 81ae693..12c2e1f 100644
--- a/include/configs/smdk5420.h
+++ b/include/configs/smdk5420.h
@@ -16,9 +16,6 @@
 
 #define CONFIG_SYS_SDRAM_BASE	0x20000000
 
-/* USB */
-#define CONFIG_USB_XHCI_EXYNOS
-
 /* DRAM Memory Banks */
 #define SDRAM_BANK_SIZE		(512UL << 20UL)	/* 512 MB */